Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Wed, 23 Jun 2010 13:17:54 +0000 (13:17 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Wed, 23 Jun 2010 13:17:54 +0000 (13:17 +0000)

Trivial merge